Autogenerated HTML docs for v1.5.6.1-156-ge903b
diff --git a/git-branch.html b/git-branch.html index 59bb85d..2c1f887 100644 --- a/git-branch.html +++ b/git-branch.html
@@ -273,12 +273,12 @@ <h2>SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git-branch</em> [--color | --no-color] [-r | -a] [--merged | --no-merged] +<div class="content"><em>git branch</em> [--color | --no-color] [-r | -a] [--merged | --no-merged] [-v [--abbrev=<length> | --no-abbrev]] [--contains <commit>] -<em>git-branch</em> [--track | --no-track] [-l] [-f] <branchname> [<start-point>] -<em>git-branch</em> (-m | -M) [<oldbranch>] <newbranch> -<em>git-branch</em> (-d | -D) [-r] <branchname>…</div></div> +<em>git branch</em> [--track | --no-track] [-l] [-f] <branchname> [<start-point>] +<em>git branch</em> (-m | -M) [<oldbranch>] <newbranch> +<em>git branch</em> (-d | -D) [-r] <branchname>…</div></div> </div> <h2>DESCRIPTION</h2> <div class="sectionbody"> @@ -299,7 +299,7 @@ working tree to it; use "git checkout <newbranch>" to switch to the new branch.</p> <p>When a local branch is started off a remote branch, git sets up the -branch so that <a href="git-pull.html">git-pull(1)</a> will appropriately merge from +branch so that <tt>git-pull</tt> will appropriately merge from the remote branch. This behavior may be changed via the global <tt>branch.autosetupmerge</tt> configuration flag. That setting can be overridden by using the <tt>--track</tt> and <tt>--no-track</tt> options.</p> @@ -313,7 +313,7 @@ has a reflog then the reflog will also be deleted.</p> <p>Use -r together with -d to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist -in remote repository or if <a href="git-fetch.html">git-fetch(1)</a> was configured not to fetch +in remote repository or if <tt>git-fetch</tt> was configured not to fetch them again. See also <em>prune</em> subcommand of <a href="git-remote.html">git-remote(1)</a> for way to clean up all obsolete remote-tracking branches.</p> </div> @@ -437,14 +437,14 @@ </dt> <dd> <p> - When creating a new branch, set up configuration so that git-pull + When creating a new branch, set up configuration so that <tt>git-pull</tt> will automatically retrieve data from the start point, which must be a branch. Use this if you always pull from the same upstream branch into the new branch, and if you don't want to use "git pull <repository> <refspec>" explicitly. This behavior is the default when the start point is a remote branch. Set the branch.autosetupmerge configuration variable to <tt>false</tt> if you want - git-checkout and git-branch to always behave as if <em>--no-track</em> were + <tt>git-checkout</tt> and <tt>git-branch</tt> to always behave as if <em>--no-track</em> were given. Set it to <tt>always</tt> if you want this behavior when the start-point is either a local or remote branch. </p> @@ -616,7 +616,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 08-Jun-2008 22:46:20 UTC +Last updated 02-Jul-2008 03:01:33 UTC </div> </div> </body>
